up version to 1.3.7, interface age 0, binary age 0. depend on glib 1.3.7.
authorTim Janik <timj@gtk.org>
Thu, 28 Jun 2001 17:12:40 +0000 (17:12 +0000)
committerTim Janik <timj@src.gnome.org>
Thu, 28 Jun 2001 17:12:40 +0000 (17:12 +0000)
Thu Jun 28 17:18:41 2001  Tim Janik  <timj@gtk.org>

* configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
age 0, binary age 0. depend on glib 1.3.7.

* gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.

* gtk/gtkmenubar.c: same here.

* gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.

* gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.

* gtk/gtkentry.c (gtk_entry_focus_in): same here.

* gtk/gtkmenubar.c (add_to_window): likewise.

* gtk/gtktextbtree.c: and here...

* gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.

* gtk/gtktoolbar.c (gtk_toolbar_init): once more.

* gtk/gtktreemodel.c (connect_ref_callbacks): and another time.

* gtk/gtktreeviewcolumn.c:
(_gtk_tree_view_column_set_tree_view): yet again.

* demos/gtk-demo/images.c (progressive_timeout): demonstrate
signal connections without g_signal_connect_data().

* demos/gtk-demo/stock_browser.c (do_stock_browser): second
demo of the matter.

* demos/testpixbuf.c (main): running out of equality phrases for the
ChangeLog, but had to adapt connections here as well.

* demos/testanimation.c (progressive_timeout): and for the fun of it,
tackled this the same way.

* tests/testtext.c (create_view): ok, it's becoming a pain at this
point, but had enough enery for one more fix.

* tests/testtreecolumns.c (main): stand up man, do your work!

* tests/testtreeview.c (set_columns_type): ok, this is the last file i
fix, either that's been all of it or CVS gtk is broken yet again.

28 files changed:
ChangeLog
ChangeLog.pre-2-0
ChangeLog.pre-2-10
ChangeLog.pre-2-2
ChangeLog.pre-2-4
ChangeLog.pre-2-6
ChangeLog.pre-2-8
configure.in
demos/gtk-demo/images.c
demos/gtk-demo/stock_browser.c
demos/testanimation.c
demos/testpixbuf.c
docs/reference/gtk/tmpl/gtkrc.sgml
gtk/gtkcolorsel.c
gtk/gtkcontainer.c
gtk/gtkentry.c
gtk/gtkmenubar.c
gtk/gtktextbtree.c
gtk/gtktextview.c
gtk/gtktoolbar.c
gtk/gtktreemodel.c
gtk/gtktreeviewcolumn.c
tests/Makefile.am
tests/prop-editor.c
tests/testtext.c
tests/testtreecolumns.c
tests/testtreefocus.c
tests/testtreeview.c

index b09be1b2ec92481808e7ed180176355d18ef61a8..61ecc6428297aec9ca0dc911171c1b6a7d73e8c9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,51 @@
+Thu Jun 28 17:18:41 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
+       age 0, binary age 0. depend on glib 1.3.7.
+
+       * gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
+
+       * gtk/gtkmenubar.c: same here.
+       
+       * gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
+
+       * gtk/gtkentry.c (gtk_entry_focus_in): same here.
+       
+       * gtk/gtkmenubar.c (add_to_window): likewise.
+       
+       * gtk/gtktextbtree.c: and here...
+       
+       * gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
+       
+       * gtk/gtktoolbar.c (gtk_toolbar_init): once more.
+       
+       * gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
+       
+       * gtk/gtktreeviewcolumn.c:
+       (_gtk_tree_view_column_set_tree_view): yet again.
+
+       * demos/gtk-demo/images.c (progressive_timeout): demonstrate
+       signal connections without g_signal_connect_data().
+       
+       * demos/gtk-demo/stock_browser.c (do_stock_browser): second
+       demo of the matter.
+       
+       * demos/testpixbuf.c (main): running out of equality phrases for the
+       ChangeLog, but had to adapt connections here as well.
+       
+       * demos/testanimation.c (progressive_timeout): and for the fun of it,
+       tackled this the same way.
+       
+       * tests/testtext.c (create_view): ok, it's becoming a pain at this
+       point, but had enough enery for one more fix.
+
+       * tests/testtreecolumns.c (main): stand up man, do your work!
+
+       * tests/testtreeview.c (set_columns_type): ok, this is the last file i
+       fix, either that's been all of it or CVS gtk is broken yet again.
+       
 2001-06-29  James Henstridge  <james@daa.com.au>
 
        The following changes correspond to bug #56812
index b09be1b2ec92481808e7ed180176355d18ef61a8..61ecc6428297aec9ca0dc911171c1b6a7d73e8c9 100644 (file)
@@ -1,3 +1,51 @@
+Thu Jun 28 17:18:41 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
+       age 0, binary age 0. depend on glib 1.3.7.
+
+       * gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
+
+       * gtk/gtkmenubar.c: same here.
+       
+       * gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
+
+       * gtk/gtkentry.c (gtk_entry_focus_in): same here.
+       
+       * gtk/gtkmenubar.c (add_to_window): likewise.
+       
+       * gtk/gtktextbtree.c: and here...
+       
+       * gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
+       
+       * gtk/gtktoolbar.c (gtk_toolbar_init): once more.
+       
+       * gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
+       
+       * gtk/gtktreeviewcolumn.c:
+       (_gtk_tree_view_column_set_tree_view): yet again.
+
+       * demos/gtk-demo/images.c (progressive_timeout): demonstrate
+       signal connections without g_signal_connect_data().
+       
+       * demos/gtk-demo/stock_browser.c (do_stock_browser): second
+       demo of the matter.
+       
+       * demos/testpixbuf.c (main): running out of equality phrases for the
+       ChangeLog, but had to adapt connections here as well.
+       
+       * demos/testanimation.c (progressive_timeout): and for the fun of it,
+       tackled this the same way.
+       
+       * tests/testtext.c (create_view): ok, it's becoming a pain at this
+       point, but had enough enery for one more fix.
+
+       * tests/testtreecolumns.c (main): stand up man, do your work!
+
+       * tests/testtreeview.c (set_columns_type): ok, this is the last file i
+       fix, either that's been all of it or CVS gtk is broken yet again.
+       
 2001-06-29  James Henstridge  <james@daa.com.au>
 
        The following changes correspond to bug #56812
index b09be1b2ec92481808e7ed180176355d18ef61a8..61ecc6428297aec9ca0dc911171c1b6a7d73e8c9 100644 (file)
@@ -1,3 +1,51 @@
+Thu Jun 28 17:18:41 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
+       age 0, binary age 0. depend on glib 1.3.7.
+
+       * gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
+
+       * gtk/gtkmenubar.c: same here.
+       
+       * gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
+
+       * gtk/gtkentry.c (gtk_entry_focus_in): same here.
+       
+       * gtk/gtkmenubar.c (add_to_window): likewise.
+       
+       * gtk/gtktextbtree.c: and here...
+       
+       * gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
+       
+       * gtk/gtktoolbar.c (gtk_toolbar_init): once more.
+       
+       * gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
+       
+       * gtk/gtktreeviewcolumn.c:
+       (_gtk_tree_view_column_set_tree_view): yet again.
+
+       * demos/gtk-demo/images.c (progressive_timeout): demonstrate
+       signal connections without g_signal_connect_data().
+       
+       * demos/gtk-demo/stock_browser.c (do_stock_browser): second
+       demo of the matter.
+       
+       * demos/testpixbuf.c (main): running out of equality phrases for the
+       ChangeLog, but had to adapt connections here as well.
+       
+       * demos/testanimation.c (progressive_timeout): and for the fun of it,
+       tackled this the same way.
+       
+       * tests/testtext.c (create_view): ok, it's becoming a pain at this
+       point, but had enough enery for one more fix.
+
+       * tests/testtreecolumns.c (main): stand up man, do your work!
+
+       * tests/testtreeview.c (set_columns_type): ok, this is the last file i
+       fix, either that's been all of it or CVS gtk is broken yet again.
+       
 2001-06-29  James Henstridge  <james@daa.com.au>
 
        The following changes correspond to bug #56812
index b09be1b2ec92481808e7ed180176355d18ef61a8..61ecc6428297aec9ca0dc911171c1b6a7d73e8c9 100644 (file)
@@ -1,3 +1,51 @@
+Thu Jun 28 17:18:41 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
+       age 0, binary age 0. depend on glib 1.3.7.
+
+       * gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
+
+       * gtk/gtkmenubar.c: same here.
+       
+       * gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
+
+       * gtk/gtkentry.c (gtk_entry_focus_in): same here.
+       
+       * gtk/gtkmenubar.c (add_to_window): likewise.
+       
+       * gtk/gtktextbtree.c: and here...
+       
+       * gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
+       
+       * gtk/gtktoolbar.c (gtk_toolbar_init): once more.
+       
+       * gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
+       
+       * gtk/gtktreeviewcolumn.c:
+       (_gtk_tree_view_column_set_tree_view): yet again.
+
+       * demos/gtk-demo/images.c (progressive_timeout): demonstrate
+       signal connections without g_signal_connect_data().
+       
+       * demos/gtk-demo/stock_browser.c (do_stock_browser): second
+       demo of the matter.
+       
+       * demos/testpixbuf.c (main): running out of equality phrases for the
+       ChangeLog, but had to adapt connections here as well.
+       
+       * demos/testanimation.c (progressive_timeout): and for the fun of it,
+       tackled this the same way.
+       
+       * tests/testtext.c (create_view): ok, it's becoming a pain at this
+       point, but had enough enery for one more fix.
+
+       * tests/testtreecolumns.c (main): stand up man, do your work!
+
+       * tests/testtreeview.c (set_columns_type): ok, this is the last file i
+       fix, either that's been all of it or CVS gtk is broken yet again.
+       
 2001-06-29  James Henstridge  <james@daa.com.au>
 
        The following changes correspond to bug #56812
index b09be1b2ec92481808e7ed180176355d18ef61a8..61ecc6428297aec9ca0dc911171c1b6a7d73e8c9 100644 (file)
@@ -1,3 +1,51 @@
+Thu Jun 28 17:18:41 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
+       age 0, binary age 0. depend on glib 1.3.7.
+
+       * gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
+
+       * gtk/gtkmenubar.c: same here.
+       
+       * gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
+
+       * gtk/gtkentry.c (gtk_entry_focus_in): same here.
+       
+       * gtk/gtkmenubar.c (add_to_window): likewise.
+       
+       * gtk/gtktextbtree.c: and here...
+       
+       * gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
+       
+       * gtk/gtktoolbar.c (gtk_toolbar_init): once more.
+       
+       * gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
+       
+       * gtk/gtktreeviewcolumn.c:
+       (_gtk_tree_view_column_set_tree_view): yet again.
+
+       * demos/gtk-demo/images.c (progressive_timeout): demonstrate
+       signal connections without g_signal_connect_data().
+       
+       * demos/gtk-demo/stock_browser.c (do_stock_browser): second
+       demo of the matter.
+       
+       * demos/testpixbuf.c (main): running out of equality phrases for the
+       ChangeLog, but had to adapt connections here as well.
+       
+       * demos/testanimation.c (progressive_timeout): and for the fun of it,
+       tackled this the same way.
+       
+       * tests/testtext.c (create_view): ok, it's becoming a pain at this
+       point, but had enough enery for one more fix.
+
+       * tests/testtreecolumns.c (main): stand up man, do your work!
+
+       * tests/testtreeview.c (set_columns_type): ok, this is the last file i
+       fix, either that's been all of it or CVS gtk is broken yet again.
+       
 2001-06-29  James Henstridge  <james@daa.com.au>
 
        The following changes correspond to bug #56812
index b09be1b2ec92481808e7ed180176355d18ef61a8..61ecc6428297aec9ca0dc911171c1b6a7d73e8c9 100644 (file)
@@ -1,3 +1,51 @@
+Thu Jun 28 17:18:41 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
+       age 0, binary age 0. depend on glib 1.3.7.
+
+       * gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
+
+       * gtk/gtkmenubar.c: same here.
+       
+       * gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
+
+       * gtk/gtkentry.c (gtk_entry_focus_in): same here.
+       
+       * gtk/gtkmenubar.c (add_to_window): likewise.
+       
+       * gtk/gtktextbtree.c: and here...
+       
+       * gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
+       
+       * gtk/gtktoolbar.c (gtk_toolbar_init): once more.
+       
+       * gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
+       
+       * gtk/gtktreeviewcolumn.c:
+       (_gtk_tree_view_column_set_tree_view): yet again.
+
+       * demos/gtk-demo/images.c (progressive_timeout): demonstrate
+       signal connections without g_signal_connect_data().
+       
+       * demos/gtk-demo/stock_browser.c (do_stock_browser): second
+       demo of the matter.
+       
+       * demos/testpixbuf.c (main): running out of equality phrases for the
+       ChangeLog, but had to adapt connections here as well.
+       
+       * demos/testanimation.c (progressive_timeout): and for the fun of it,
+       tackled this the same way.
+       
+       * tests/testtext.c (create_view): ok, it's becoming a pain at this
+       point, but had enough enery for one more fix.
+
+       * tests/testtreecolumns.c (main): stand up man, do your work!
+
+       * tests/testtreeview.c (set_columns_type): ok, this is the last file i
+       fix, either that's been all of it or CVS gtk is broken yet again.
+       
 2001-06-29  James Henstridge  <james@daa.com.au>
 
        The following changes correspond to bug #56812
index b09be1b2ec92481808e7ed180176355d18ef61a8..61ecc6428297aec9ca0dc911171c1b6a7d73e8c9 100644 (file)
@@ -1,3 +1,51 @@
+Thu Jun 28 17:18:41 2001  Tim Janik  <timj@gtk.org>
+
+       * configure.in (GTK_MICRO_VERSION): up version to 1.3.7, interface
+       age 0, binary age 0. depend on glib 1.3.7.
+
+       * gtk/gtkcontainer.c: remove g_signal_handlers_disconnect_by_func() hack.
+
+       * gtk/gtkmenubar.c: same here.
+       
+       * gtk/gtkcontainer.c (gtk_container_focus_tab): fix param-spec retrival.
+
+       * gtk/gtkcolorsel.c (gtk_color_selection_init): fix connect_data() usage.
+
+       * gtk/gtkentry.c (gtk_entry_focus_in): same here.
+       
+       * gtk/gtkmenubar.c (add_to_window): likewise.
+       
+       * gtk/gtktextbtree.c: and here...
+       
+       * gtk/gtktextview.c (gtk_text_view_ensure_layout): same thing.
+       
+       * gtk/gtktoolbar.c (gtk_toolbar_init): once more.
+       
+       * gtk/gtktreemodel.c (connect_ref_callbacks): and another time.
+       
+       * gtk/gtktreeviewcolumn.c:
+       (_gtk_tree_view_column_set_tree_view): yet again.
+
+       * demos/gtk-demo/images.c (progressive_timeout): demonstrate
+       signal connections without g_signal_connect_data().
+       
+       * demos/gtk-demo/stock_browser.c (do_stock_browser): second
+       demo of the matter.
+       
+       * demos/testpixbuf.c (main): running out of equality phrases for the
+       ChangeLog, but had to adapt connections here as well.
+       
+       * demos/testanimation.c (progressive_timeout): and for the fun of it,
+       tackled this the same way.
+       
+       * tests/testtext.c (create_view): ok, it's becoming a pain at this
+       point, but had enough enery for one more fix.
+
+       * tests/testtreecolumns.c (main): stand up man, do your work!
+
+       * tests/testtreeview.c (set_columns_type): ok, this is the last file i
+       fix, either that's been all of it or CVS gtk is broken yet again.
+       
 2001-06-29  James Henstridge  <james@daa.com.au>
 
        The following changes correspond to bug #56812
index 1f7e1a9424bd76c764f1412e4cae044199678808..98b30409fe955d8502862971d5702201c6588037 100644 (file)
@@ -34,7 +34,7 @@ AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=3
-GTK_MICRO_VERSION=6
+GTK_MICRO_VERSION=7
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@@ -289,7 +289,7 @@ AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
 # 
 
 GLIB_PACKAGES="gobject-2.0 gmodule-2.0"
-GLIB_REQUIRED_VERSION=1.3.4
+GLIB_REQUIRED_VERSION=1.3.7
 
 AM_PATH_GLIB_2_0($GLIB_REQUIRED_VERSION, :,
   AC_MSG_ERROR([
index 343810979cff402817f9547afe8a29b0441dae14..d2090428eb589cc855bdb7ef79cdcee4a1a73039 100644 (file)
@@ -224,17 +224,15 @@ progressive_timeout (gpointer data)
       
       pixbuf_loader = gdk_pixbuf_loader_new ();
       
-      g_signal_connect_data (G_OBJECT (pixbuf_loader),
-                            "area_prepared",
-                            G_CALLBACK (progressive_prepared_callback),
-                            image,
-                            NULL, FALSE, FALSE);
+      g_signal_connect (G_OBJECT (pixbuf_loader),
+                       "area_prepared",
+                       G_CALLBACK (progressive_prepared_callback),
+                       image);
       
-      g_signal_connect_data (G_OBJECT (pixbuf_loader),
-                            "area_updated",
-                            G_CALLBACK (progressive_updated_callback),
-                            image,
-                            NULL, FALSE, FALSE);
+      g_signal_connect (G_OBJECT (pixbuf_loader),
+                       "area_updated",
+                       G_CALLBACK (progressive_updated_callback),
+                       image);
     }
 
   /* leave timeout installed */
index 6ac5c1f395a66a5d52cc203be3fc252125dec65f..a850a428d7c9572e70b60293c950ec771bec3cd4 100644 (file)
@@ -500,10 +500,10 @@ do_stock_browser (void)
       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
       gtk_tree_selection_set_mode (selection, GTK_TREE_SELECTION_SINGLE);
       
-      g_signal_connect_data (G_OBJECT (selection),
-                             "changed",
-                             G_CALLBACK (selection_changed),
-                             NULL, NULL, FALSE, FALSE);
+      g_signal_connect (G_OBJECT (selection),
+                       "changed",
+                       G_CALLBACK (selection_changed),
+                       NULL);
     }
 
   if (!GTK_WIDGET_VISIBLE (window))
index 82b932c2d0707868bf7759168ae897e5062558c4..e0ce24e8f55045233126f9d1e5abbe88374697e5 100644 (file)
@@ -285,17 +285,14 @@ progressive_timeout (gpointer data)
       
       lc->pixbuf_loader = gdk_pixbuf_loader_new ();
       
-      g_signal_connect_data (G_OBJECT (lc->pixbuf_loader),
-                             "area_prepared",
-                             G_CALLBACK (progressive_prepared_callback),
-                             image,
-                             NULL, FALSE, FALSE);
-      
-      g_signal_connect_data (G_OBJECT (lc->pixbuf_loader),
-                             "area_updated",
-                             G_CALLBACK (progressive_updated_callback),
-                             image,
-                             NULL, FALSE, FALSE);
+      g_signal_connect (G_OBJECT (lc->pixbuf_loader),
+                       "area_prepared",
+                       G_CALLBACK (progressive_prepared_callback),
+                       image);
+      g_signal_connect (G_OBJECT (lc->pixbuf_loader),
+                       "area_updated",
+                       G_CALLBACK (progressive_updated_callback),
+                       image);
     }
 
   /* leave timeout installed */
index a2ecbe1f089615058ca68afe3c83321e850b4ce1..8f80d31180554e1b167163bf6911dd4a93f810b1 100644 (file)
@@ -605,18 +605,14 @@ main (int argc, char **argv)
                        status.rgbwin = &rgb_window;
 
                        status.buf = g_malloc (readlen);
-                        g_signal_connect_data (G_OBJECT(pixbuf_loader),
-                                               "area_prepared",
-                                               GTK_SIGNAL_FUNC(progressive_prepared_callback),
-                                               &rgb_window,
-                                               NULL, FALSE, FALSE);
-
-                        g_signal_connect_data (G_OBJECT(pixbuf_loader),
-                                               "area_updated",
-                                               GTK_SIGNAL_FUNC(progressive_updated_callback),
-                                               &rgb_window,
-                                               NULL, FALSE, FALSE);
-
+                        g_signal_connect (G_OBJECT(pixbuf_loader),
+                                         "area_prepared",
+                                         GTK_SIGNAL_FUNC(progressive_prepared_callback),
+                                         &rgb_window);
+                        g_signal_connect (G_OBJECT(pixbuf_loader),
+                                         "area_updated",
+                                         GTK_SIGNAL_FUNC(progressive_updated_callback),
+                                         &rgb_window);
                        
                         status.imagefile = fopen (argv[1], "r");
                         g_assert (status.imagefile != NULL);
index 5f8876c8fee61249a82d1631a3ce25b382441a63..82694173c4ecfce1fd5632c89bb6dfc9911e7a47 100644 (file)
@@ -495,6 +495,7 @@ This can later be composited together with other
 #GtkRcStyle structures to form a #GtkStyle.
 </para>
 
+@parent_instance: 
 @name: 
 @bg_pixmap_name: 
 @font_desc: 
index a1cc67fe24f512b2d4a4d05cecd7bc90a9d11c4b..47546b83b62b75007ca239b6aeba36052054a46a 100644 (file)
@@ -1659,7 +1659,7 @@ gtk_color_selection_class_init (GtkColorSelectionClass *klass)
   g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
                          "notify::gtk-color-palette",
                          G_CALLBACK (palette_change_notify_class),
-                         NULL, NULL, FALSE, FALSE);
+                         NULL, NULL, 0);
 }
 
 /* widget functions */
@@ -1825,7 +1825,7 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
     g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
                            "notify::gtk-color-palette",
                            G_CALLBACK (palette_change_notify_instance),
-                           colorsel, NULL, FALSE, FALSE);
+                           colorsel, NULL, 0);
   
   /* hide unused stuff */
   
index 75d155b101aba44f177b1f90fed960a9f280eeb9..455eef710406dd321bd155f4e9413a47ec9e415c 100644 (file)
@@ -154,7 +154,7 @@ gtk_container_base_class_finalize (GtkContainerClass *class)
 {
   GList *list, *node;
 
-  list = g_param_spec_pool_belongings (_gtk_widget_child_property_pool, G_OBJECT_CLASS_TYPE (class));
+  list = g_param_spec_pool_list_owned (_gtk_widget_child_property_pool, G_OBJECT_CLASS_TYPE (class));
   for (node = list; node; node = node->next)
     {
       GParamSpec *pspec = node->data;
@@ -2037,10 +2037,6 @@ gtk_container_children_callback (GtkWidget *widget,
   *children = g_list_prepend (*children, widget);
 }
 
-
-/* Hack-around */
-#define g_signal_handlers_disconnect_by_func(obj, func, data) g_signal_handlers_disconnect_matched (obj, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, func, data)
-
 static void
 chain_widget_destroyed (GtkWidget *widget,
                         gpointer   user_data)
index 7a0753acd3c20868c14d2516e5a62481cd08798b..3a4576f5cc38bb023f01b281adfb78c58bbc2dd3 100644 (file)
@@ -1524,10 +1524,9 @@ gtk_entry_focus_in (GtkWidget     *widget,
   entry->need_im_reset = TRUE;
   gtk_im_context_focus_in (entry->im_context);
 
-  g_signal_connect_data (gdk_keymap_get_default (),
-                        "direction_changed",
-                        G_CALLBACK (gtk_entry_keymap_direction_changed), entry, NULL,
-                        FALSE, FALSE);
+  g_signal_connect (gdk_keymap_get_default (),
+                   "direction_changed",
+                   G_CALLBACK (gtk_entry_keymap_direction_changed), entry);
 
   gtk_entry_check_cursor_blink (entry);
   
index 9965fef932d4b61a947fb74ce24c186d2f2b950d..3b0cb73e10c1cbfca1353ea2aca5c5cb53418b89 100644 (file)
@@ -437,18 +437,14 @@ add_to_window (GtkWindow  *window,
                      "gtk-menu-bar",
                      menubar);
 
-  g_signal_connect_data (G_OBJECT (window),
-                         "key_press_event",
-                         G_CALLBACK (window_key_press_handler),
-                         menubar,
-                         NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (window),
+                   "key_press_event",
+                   G_CALLBACK (window_key_press_handler),
+                   menubar);
 
   menubar->toplevel = GTK_WIDGET (window);
 }
 
-/* Hack-around */
-#define g_signal_handlers_disconnect_by_func(obj, func, data) g_signal_handlers_disconnect_matched (obj, G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, 0, 0, NULL, func, data)
-
 static void
 remove_from_window (GtkWindow  *window,
                     GtkMenuBar *menubar)
index 40e6ca022c3c63aa316f205a1c30d517a47e7eae..8fb9dd1285dd3097dc8d1c14af1abe0891d039b7 100644 (file)
@@ -409,17 +409,15 @@ _gtk_text_btree_new (GtkTextTagTable *table,
 
   g_object_ref (G_OBJECT (tree->table));
 
-  tree->tag_changed_handler = g_signal_connect_data (G_OBJECT (tree->table),
-                                                     "tag_changed",
-                                                     G_CALLBACK (tag_changed_cb),
-                                                     tree,
-                                                     NULL, FALSE, FALSE);
-
-  tree->tag_removed_handler = g_signal_connect_data (G_OBJECT (tree->table),
-                                                     "tag_removed",
-                                                     G_CALLBACK (tag_removed_cb),
-                                                     tree,
-                                                     NULL, FALSE, FALSE);
+  tree->tag_changed_handler = g_signal_connect (G_OBJECT (tree->table),
+                                               "tag_changed",
+                                               G_CALLBACK (tag_changed_cb),
+                                               tree);
+
+  tree->tag_removed_handler = g_signal_connect (G_OBJECT (tree->table),
+                                               "tag_removed",
+                                               G_CALLBACK (tag_removed_cb),
+                                               tree);
 
   tree->mark_table = g_hash_table_new (g_str_hash, g_str_equal);
   tree->child_anchor_table = NULL;
index 0521c0e5e54d6dc4513f5bcc761ba04d7f281e92..f268e11aa423eddeb6d0ee95021618f51b8d786e 100644 (file)
@@ -1028,9 +1028,8 @@ gtk_text_view_set_buffer (GtkTextView   *text_view,
 
       text_view->first_para_pixels = 0;
 
-      g_signal_connect_data (G_OBJECT (text_view->buffer), "mark_set",
-                             G_CALLBACK (gtk_text_view_mark_set_handler), text_view,
-                             NULL, FALSE, FALSE);
+      g_signal_connect (G_OBJECT (text_view->buffer), "mark_set",
+                       G_CALLBACK (gtk_text_view_mark_set_handler), text_view);
     }
 
   if (GTK_WIDGET_VISIBLE (text_view))
@@ -3366,10 +3365,9 @@ gtk_text_view_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
       gtk_text_view_check_cursor_blink (text_view);
     }
 
-  g_signal_connect_data (gdk_keymap_get_default (),
-                        "direction_changed",
-                        G_CALLBACK (keymap_direction_changed), text_view, NULL,
-                        FALSE, FALSE);
+  g_signal_connect (gdk_keymap_get_default (),
+                   "direction_changed",
+                   G_CALLBACK (keymap_direction_changed), text_view);
   gtk_text_view_check_keymap_direction (text_view);
   
   text_view->need_im_reset = TRUE;
@@ -4331,23 +4329,20 @@ gtk_text_view_ensure_layout (GtkTextView *text_view)
       
       text_view->layout = gtk_text_layout_new ();
 
-      g_signal_connect_data (G_OBJECT (text_view->layout),
-                             "invalidated",
-                             G_CALLBACK (invalidated_handler),
-                             text_view,
-                             NULL, FALSE, FALSE);
-
-      g_signal_connect_data (G_OBJECT (text_view->layout),
-                             "changed",
-                             G_CALLBACK (changed_handler),
-                             text_view,
-                             NULL, FALSE, FALSE);
-
-      g_signal_connect_data (G_OBJECT (text_view->layout),
-                             "allocate_child",
-                             G_CALLBACK (gtk_text_view_child_allocated),
-                             text_view,
-                             NULL, FALSE, FALSE);
+      g_signal_connect (G_OBJECT (text_view->layout),
+                       "invalidated",
+                       G_CALLBACK (invalidated_handler),
+                       text_view);
+
+      g_signal_connect (G_OBJECT (text_view->layout),
+                       "changed",
+                       G_CALLBACK (changed_handler),
+                       text_view);
+
+      g_signal_connect (G_OBJECT (text_view->layout),
+                       "allocate_child",
+                       G_CALLBACK (gtk_text_view_child_allocated),
+                       text_view);
       
       if (get_buffer (text_view))
         gtk_text_layout_set_buffer (text_view->layout, get_buffer (text_view));
index a04aee87dfdf58ee789117ccfb37e90c899a24db..bb4add2716f07811e2a19b29a38850ae6eb4bc31 100644 (file)
@@ -358,16 +358,16 @@ gtk_toolbar_init (GtkToolbar *toolbar)
                 NULL);
   
   toolbar->style_set_connection =
-    g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
-                           "notify::gtk-toolbar-style",
-                           G_CALLBACK (style_change_notify),
-                           toolbar, NULL, FALSE, FALSE);
+    g_signal_connect (G_OBJECT (gtk_settings_get_global ()),
+                     "notify::gtk-toolbar-style",
+                     G_CALLBACK (style_change_notify),
+                     toolbar);
 
   toolbar->icon_size_connection =
-    g_signal_connect_data (G_OBJECT (gtk_settings_get_global ()),
-                           "notify::gtk-toolbar-icon-size",
-                           G_CALLBACK (icon_size_change_notify),
-                           toolbar, NULL, FALSE, FALSE);  
+    g_signal_connect (G_OBJECT (gtk_settings_get_global ()),
+                     "notify::gtk-toolbar-icon-size",
+                     G_CALLBACK (icon_size_change_notify),
+                     toolbar);
 }
 
 static void
index 69e58a8b130d270afe9d46572d982dcff5cd633f..34c872666f9c5dd550149e284ac6ddc8254e8153 100644 (file)
@@ -1324,29 +1324,18 @@ gtk_tree_row_ref_reordered_callback (GObject     *object,
 static void
 connect_ref_callbacks (GtkTreeModel *model)
 {
-  g_signal_connect_data (G_OBJECT (model),
-                         "inserted",
-                         (GCallback) gtk_tree_row_ref_inserted_callback,
-                         model,
-                         NULL,
-                         FALSE,
-                         FALSE);
-
-  g_signal_connect_data (G_OBJECT (model),
-                         "deleted",
-                         (GCallback) gtk_tree_row_ref_deleted_callback,
-                        model,
-                         NULL,
-                         FALSE,
-                         FALSE);
-
-  g_signal_connect_data (G_OBJECT (model),
-                         "reordered",
-                         (GCallback) gtk_tree_row_ref_reordered_callback,
-                        model,
-                         NULL,
-                         FALSE,
-                         FALSE);
+  g_signal_connect (G_OBJECT (model),
+                   "inserted",
+                   (GCallback) gtk_tree_row_ref_inserted_callback,
+                   model);
+  g_signal_connect (G_OBJECT (model),
+                   "deleted",
+                   (GCallback) gtk_tree_row_ref_deleted_callback,
+                   model);
+  g_signal_connect (G_OBJECT (model),
+                   "reordered",
+                   (GCallback) gtk_tree_row_ref_reordered_callback,
+                   model);
 }
 
 static void
index 1310e235c9d5397505064c72d172417f92173b72..851aa44f62cf59948d5a47e5a33fec9d9f75fec4 100644 (file)
@@ -939,10 +939,10 @@ _gtk_tree_view_column_set_tree_view (GtkTreeViewColumn *column,
   gtk_tree_view_column_create_button (column);
 
   column->property_changed_signal =
-         g_signal_connect_data (GTK_OBJECT (tree_view),
-                                "notify::model",
-                                GTK_SIGNAL_FUNC (gtk_tree_view_column_setup_sort_column_id_callback),
-                                column, NULL, TRUE, FALSE);
+         g_signal_connect (GTK_OBJECT (tree_view),
+                           "notify::model",
+                           GTK_SIGNAL_FUNC (gtk_tree_view_column_setup_sort_column_id_callback),
+                           column);
 
   gtk_tree_view_column_setup_sort_column_id_callback (column);
 }
index 3271380abb691b1d2ae7dcd7566718421c801495..061f07133e1934df6cf4314686b48037b5acd344 100644 (file)
@@ -77,7 +77,6 @@ testtext_LDADD = $(LDADDS)
 treestoretest_LDADD = $(LDADDS)
 
 testgtk_SOURCES =      \
-       prop-editor.c   \
        testgtk.c 
 
 testtreeview_SOURCES = \
index 701bde80304d09b17c783fb9bbfe602699d37ee6..353ac79c1afb6580749715459ed24f3656260c8b 100644 (file)
@@ -124,7 +124,7 @@ connect_controller (GObject *controller,
 
   p->modified_id = g_signal_connect_data (controller, signal, func, p,
                                          (GClosureNotify)free_object_property,
-                                         FALSE, FALSE);
+                                         0);
   g_object_set_data (controller, "object-property", p);
 }
 
index c0b171454e40d2e7968d636fe1e49c4f63c65ae5..8a348be36dccbb1c070f57f6e2b20e2e0af050a1 100644 (file)
@@ -390,10 +390,10 @@ tag_event_handler (GtkTextTag *tag, GtkWidget *widget, GdkEvent *event,
 static void
 setup_tag (GtkTextTag *tag)
 {
-  g_signal_connect_data (G_OBJECT (tag),
-                         "event",
-                         G_CALLBACK (tag_event_handler),
-                         NULL, NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (tag),
+                   "event",
+                   G_CALLBACK (tag_event_handler),
+                   NULL);
 }
 
 static const char  *book_closed_xpm[] = {
@@ -2187,10 +2187,10 @@ create_view (Buffer *buffer)
                       GTK_SIGNAL_FUNC (tab_stops_expose),
                       NULL);  
 
-  g_signal_connect_data (G_OBJECT (view->buffer->buffer),
-                         "mark_set",
-                         GTK_SIGNAL_FUNC (cursor_set_callback),
-                         view->text_view, NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (view->buffer->buffer),
+                   "mark_set",
+                   GTK_SIGNAL_FUNC (cursor_set_callback),
+                   view->text_view);
   
   /* Draw line numbers in the side windows; we should really be
    * more scientific about what width we set them to.
index 57016124c5cf095067d7d2bfdbd4f7628292a83f..10cdbb0cedb65173daaf1250e9b2ec4ee4756be4 100644 (file)
@@ -604,7 +604,7 @@ main (int argc, char *argv[])
   gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (left_tree_view), -1,
                                               "Unattached Columns", cell, "text", 0, NULL);
   cell = gtk_cell_renderer_toggle_new ();
-  g_signal_connect_data (G_OBJECT (cell), "toggled", (GCallback) set_visible, left_tree_view, NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (cell), "toggled", (GCallback) set_visible, left_tree_view);
   column = gtk_tree_view_column_new_with_attributes ("Visible", cell, NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (left_tree_view), column);
   g_object_unref (G_OBJECT (column));
@@ -665,7 +665,7 @@ main (int argc, char *argv[])
   gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (top_right_tree_view), -1,
                                               NULL, cell, "text", 0, NULL);
   cell = gtk_cell_renderer_toggle_new ();
-  g_signal_connect_data (G_OBJECT (cell), "toggled", (GCallback) set_visible, top_right_tree_view, NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (cell), "toggled", (GCallback) set_visible, top_right_tree_view);
   column = gtk_tree_view_column_new_with_attributes (NULL, cell, NULL);
   gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (top_right_tree_view), column);
@@ -680,7 +680,7 @@ main (int argc, char *argv[])
   gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (bottom_right_tree_view), -1,
                                               NULL, cell, "text", 0, NULL);
   cell = gtk_cell_renderer_toggle_new ();
-  g_signal_connect_data (G_OBJECT (cell), "toggled", (GCallback) set_visible, bottom_right_tree_view, NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (cell), "toggled", (GCallback) set_visible, bottom_right_tree_view);
   column = gtk_tree_view_column_new_with_attributes (NULL, cell, NULL);
   gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (bottom_right_tree_view), column);
index 5d3bf49d84d12c8406dc27903be168ba4e140f52..854c3f84adfbc78434e3ec06070dce0cd18a0411 100644 (file)
@@ -342,7 +342,7 @@ main (int argc, char *argv[])
 
   /* Alex Column */
   renderer = gtk_cell_renderer_toggle_new ();
-  g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (alex_toggled), model, NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (alex_toggled), model);
 
   g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
@@ -360,7 +360,7 @@ main (int argc, char *argv[])
 
   /* Havoc Column */
   renderer = gtk_cell_renderer_toggle_new ();
-  g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (havoc_toggled), model, NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (havoc_toggled), model);
 
   g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
@@ -377,7 +377,7 @@ main (int argc, char *argv[])
 
   /* Tim Column */
   renderer = gtk_cell_renderer_toggle_new ();
-  g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (tim_toggled), model, NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (tim_toggled), model);
 
   g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
@@ -395,7 +395,7 @@ main (int argc, char *argv[])
 
   /* Owen Column */
   renderer = gtk_cell_renderer_toggle_new ();
-  g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (owen_toggled), model, NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (owen_toggled), model);
   g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
                                               -1, "Owen",
@@ -411,7 +411,7 @@ main (int argc, char *argv[])
 
   /* Owen Column */
   renderer = gtk_cell_renderer_toggle_new ();
-  g_signal_connect_data (G_OBJECT (renderer), "toggled", G_CALLBACK (dave_toggled), model, NULL, FALSE, FALSE);
+  g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (dave_toggled), model);
   g_object_set (G_OBJECT (renderer), "xalign", 0.0, NULL);
   col_offset = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (tree_view),
                                               -1, "Dave",
index 204d4574b27cb87c112b1d76bf64a2cba5848080..f26c462dbf631ec6f7e5552e2f3c56d5f8d84bf1 100644 (file)
@@ -159,13 +159,10 @@ static void
 setup_column (GtkTreeViewColumn *col)
 {
   gtk_tree_view_column_set_clickable (col, TRUE);
-  g_signal_connect_data (G_OBJECT (col),
-                         "clicked",
-                         (GCallback) col_clicked_cb,
-                         NULL,
-                         NULL,
-                         FALSE,
-                         FALSE);
+  g_signal_connect (G_OBJECT (col),
+                   "clicked",
+                   (GCallback) col_clicked_cb,
+                   NULL);
 }
 
 static void
@@ -302,9 +299,8 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type)
 
       rend = gtk_cell_renderer_toggle_new ();
 
-      g_signal_connect_data (G_OBJECT (rend), "toggled",
-                             GTK_SIGNAL_FUNC (toggled_callback), tree_view,
-                             NULL, FALSE, FALSE);
+      g_signal_connect (G_OBJECT (rend), "toggled",
+                       GTK_SIGNAL_FUNC (toggled_callback), tree_view);
       
       col = gtk_tree_view_column_new_with_attributes ("Column 3",
                                                       rend,
@@ -335,9 +331,8 @@ set_columns_type (GtkTreeView *tree_view, ColumnsType type)
        */
       g_object_set (G_OBJECT (rend), "radio", TRUE, NULL);
       
-      g_signal_connect_data (G_OBJECT (rend), "toggled",
-                             G_CALLBACK (toggled_callback), tree_view,
-                             NULL, FALSE, FALSE);
+      g_signal_connect (G_OBJECT (rend), "toggled",
+                       G_CALLBACK (toggled_callback), tree_view);
       
       col = gtk_tree_view_column_new_with_attributes ("Column 4",
                                                       rend,